From f944a85c521942eb543037197d0f9c4037b1fd3b Mon Sep 17 00:00:00 2001 From: Andrew Wesie Date: Fri, 16 Oct 2020 12:29:02 +0100 Subject: [PATCH] [PATCH] codecparsers: h264parser: guard against ref_pic_markings overflow Part-of: Gbp-Pq: Name 02_ref_pic_markings_overflow.patch --- gst-libs/gst/codecparsers/gsth264parser.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/codecparsers/gsth264parser.c b/gst-libs/gst/codecparsers/gsth264parser.c index 73968db9..b65b90f5 100644 --- a/gst-libs/gst/codecparsers/gsth264parser.c +++ b/gst-libs/gst/codecparsers/gsth264parser.c @@ -712,13 +712,17 @@ gst_h264_slice_parse_dec_ref_pic_marking (GstH264SliceHdr * slice, dec_ref_pic_m->n_ref_pic_marking = 0; while (1) { - refpicmarking = - &dec_ref_pic_m->ref_pic_marking[dec_ref_pic_m->n_ref_pic_marking]; - READ_UE (nr, mem_mgmt_ctrl_op); if (mem_mgmt_ctrl_op == 0) break; + if (dec_ref_pic_m->n_ref_pic_marking >= + G_N_ELEMENTS (dec_ref_pic_m->ref_pic_marking)) + goto error; + + refpicmarking = + &dec_ref_pic_m->ref_pic_marking[dec_ref_pic_m->n_ref_pic_marking]; + refpicmarking->memory_management_control_operation = mem_mgmt_ctrl_op; if (mem_mgmt_ctrl_op == 1 || mem_mgmt_ctrl_op == 3) -- 2.30.2